Add "ostree remote list" command

Lists available remote names.

diff --git a/doc/ostree-remote.xml b/doc/ostree-remote.xml
index a9aa97420b23f77caa2fecd6e62f07600aa5a163..add2432294392eba0a3405c4dc3619be65ae2167 100644 (file)
--- a/doc/ostree-remote.xml
+++ b/doc/ostree-remote.xml
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.
 
     <refsynopsisdiv>
             <cmdsynopsis>
-                <command>ostree remote</command> <arg choice="opt" rep="repeat">OPTIONS</arg> add <arg choice="req">NAME</arg> <arg choice="req">URL</arg> <arg choice="opt" rep="repeat">BRANCH</arg>
+                <command>ostree remote add</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">NAME</arg> <arg choice="req">URL</arg> <arg choice="opt" rep="repeat">BRANCH</arg>
             </cmdsynopsis>
             <cmdsynopsis>
                 <command>ostree remote delete</command> <arg choice="req">NAME</arg>
@@ -57,6 +57,9 @@ Boston, MA 02111-1307, USA.
             <cmdsynopsis>
                 <command>ostree remote show-url</command> <arg choice="req">NAME</arg>
             </cmdsynopsis>
+            <cmdsynopsis>
+                <command>ostree remote list</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">NAME</arg>
+            </cmdsynopsis>
     </refsynopsisdiv>
 
     <refsect1>
@@ -68,7 +71,7 @@ Boston, MA 02111-1307, USA.
     </refsect1>
 
     <refsect1>
-        <title>Options</title>
+        <title>'Add' Options</title>
 
         <variablelist>
             <varlistentry>
@@ -89,6 +92,20 @@ Boston, MA 02111-1307, USA.
         </variablelist>
     </refsect1>
 
+    <refsect1>
+        <title>'List' Options</title>
+
+        <variablelist>
+            <varlistentry>
+                <term><option>-u, --show-urls</option></term>
+
+                <listitem><para>
+                    Show remote URLs in list
+                </para></listitem>
+            </varlistentry>
+        </variablelist>
+    </refsect1>
+
     <refsect1>
         <title>Example</title>
         <para><command>$ ostree remote show-url local</command></para>

diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c
index fc7f93ecaa7bbb9ddeb44d06a87be6ffa03d971c..aa40122ae2c0e744183905c964df3d89431214f8 100644 (file)
--- a/src/ostree/ot-builtin-remote.c
+++ b/src/ostree/ot-builtin-remote.c
@@ -221,6 +221,61 @@ ostree_remote_builtin_show_url (int argc, char **argv, GCancellable *cancellable
   return ret;
 }
 
+static gboolean opt_show_urls;
+
+static GOptionEntry list_option_entries[] = {
+  { "show-urls", 'u', 0, G_OPTION_ARG_NONE, &opt_show_urls, "Show remote URLs in list", NULL },
+  { NULL }
+};
+
+static gboolean
+ostree_remote_builtin_list (int argc, char **argv, GCancellable *cancellable, GError **error)
+{
+  GOptionContext *context;
+  gs_unref_object OstreeRepo *repo = NULL;
+  gs_strfreev char **remotes = NULL;
+  guint ii, n_remotes = 0;
+  gboolean ret = FALSE;
+
+  context = g_option_context_new ("- List remote repository names");
+
+  if (!ostree_option_context_parse (context, list_option_entries, &argc, &argv,
+                                    OSTREE_BUILTIN_FLAG_NONE, &repo, cancellable, error))
+    goto out;
+
+  remotes = ostree_repo_remote_list (repo, &n_remotes);
+
+  if (opt_show_urls)
+    {
+      int max_length = 0;
+
+      for (ii = 0; ii < n_remotes; ii++)
+        max_length = MAX (max_length, strlen (remotes[ii]));
+
+      for (ii = 0; ii < n_remotes; ii++)
+        {
+          gs_free char *remote_url = NULL;
+
+          if (!ostree_repo_remote_get_url (repo, remotes[ii], &remote_url, error))
+            goto out;
+
+          g_print ("%-*s  %s\n", max_length, remotes[ii], remote_url);
+        }
+    }
+  else
+    {
+      for (ii = 0; ii < n_remotes; ii++)
+        g_print ("%s\n", remotes[ii]);
+    }
+
+  ret = TRUE;
+
+ out:
+  g_option_context_free (context);
+
+  return ret;
+}
+
 typedef struct {
   const char *name;
   gboolean (*fn) (int argc, char **argv, GCancellable *cancellable, GError **error);
@@ -230,6 +285,7 @@ static OstreeRemoteCommand remote_subcommands[] = {
   { "add", ostree_remote_builtin_add },
   { "delete", ostree_remote_builtin_delete },
   { "show-url", ostree_remote_builtin_show_url },
+  { "list", ostree_remote_builtin_list },
   { NULL, NULL }
 };
 

diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh
index 5e1a0eede27d8a3cb38384250a456bf2d69639db..cf9720d73349530ae65cbeede89592b03628b2a0 100755 (executable)
--- a/tests/test-remote-add.sh
+++ b/tests/test-remote-add.sh
@@ -45,6 +45,24 @@ $OSTREE remote add --if-not-exists --no-gpg-verify another-noexist http://anothe
 $OSTREE remote show-url another-noexist >/dev/null
 echo "ok"
 
+$OSTREE remote list > list.txt
+assert_file_has_content list.txt "origin"
+assert_file_has_content list.txt "another"
+assert_file_has_content list.txt "another-noexist"
+assert_not_file_has_content list.txt "http://example.com/ostree/gnome"
+assert_not_file_has_content list.txt "http://another.com/repo"
+assert_not_file_has_content list.txt "http://another-noexist.example.com/anotherrepo"
+echo "ok remote list"
+
+$OSTREE remote list --show-urls > list.txt
+assert_file_has_content list.txt "origin"
+assert_file_has_content list.txt "another"
+assert_file_has_content list.txt "another-noexist"
+assert_file_has_content list.txt "http://example.com/ostree/gnome"
+assert_file_has_content list.txt "http://another.com/repo"
+assert_file_has_content list.txt "http://another-noexist.example.com/anotherrepo"
+echo "ok remote list with urls"
+
 $OSTREE remote delete another
 echo "ok remote delete"
 
@@ -68,3 +86,10 @@ if $OSTREE remote show-url origin 2>/dev/null; then
     assert_not_reached "Deleting remote unexpectedly failed"
 fi
 echo "ok"
+
+$OSTREE remote list > list.txt
+assert_not_file_has_content list.txt "origin"
+# Can't grep for 'another' because of 'another-noexist'
+assert_file_has_content list.txt "another-noexist"
+echo "ok remote list remaining"
+